auto upstream
authorJoakim Verona <joakim@verona.se>
Fri, 28 Dec 2012 14:41:21 +0000 (15:41 +0100)
committerJoakim Verona <joakim@verona.se>
Fri, 28 Dec 2012 14:41:21 +0000 (15:41 +0100)

Trivial merge